* README has been renamed to README.md
* debian/libgtk-4-0.symbols: Update
* debian/libgtk-4-common.install.in: themes are bundled in the gtkresources
- * Refresh no-accessibility-dump.patch
* Disable 018_gdkenumtypes.c_location.patch: might not be needed any more
- * Cherry-pick patches:
- - git_add-a-return-value.patch
- - git_add-default-return-values.patch
- - git_fix-build.patch
- - git_install-printbackends.patch
* Update Vcs fields for migration to https://salsa.debian.org/
[ Simon McVittie ]
* d/copyright: Update
* Normalize various packaging files with wrap-and-sort -a
* Update build-dependencies
+ * d/p/gdk-x11-Check-if-we-have-access-to-GL-before-using-G.patch:
+ Drop, obsoleted by commit 02eb344 in GTK+ 3.93
+ * d/p/no-accessibility-dump.patch: Drop, no longer needed.
+ The build-time tests correctly set GTK_CSD=1 now.
-- Jeremy Bicha <jbicha@debian.org> Fri, 19 Jan 2018 22:05:35 -0500
+++ /dev/null
-From: Emmanuele Bassi <ebassi@gnome.org>
-Date: Fri, 20 Jan 2017 18:07:01 +0000
-Subject: [PATCH] gdk/x11: Check if we have access to GL before using GLX API
-
-If the platform does not have access to libGL then any call to GL and
-GLX API through libepoxy will fail with an assertion. Until such time
-that libepoxy exposes API for us to use, we can simply dlopen libGL
-ourselves and do a symbol check.
-
-[smcv: fix typo]
-
-Bug: https://bugzilla.gnome.org/show_bug.cgi?id=775279
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=847366
----
- gdk/x11/gdkglcontext-x11.c | 26 ++++++++++++++++++++++++++
- 1 file changed, 26 insertions(+)
-
-diff --git a/gdk/x11/gdkglcontext-x11.c b/gdk/x11/gdkglcontext-x11.c
-index d76c29e..086a99e 100644
---- a/gdk/x11/gdkglcontext-x11.c
-+++ b/gdk/x11/gdkglcontext-x11.c
-@@ -797,6 +797,32 @@ gdk_x11_screen_init_gl (GdkScreen *screen)
- if (_gdk_gl_flags & GDK_GL_DISABLE)
- return FALSE;
-
-+ /* This is an ad hoc check that bypasses libepoxy to check if libGL.so is
-+ * unavailable, and disables GL support if that's the case
-+ *
-+ * Ideally, libepoxy should do this for us, but that would require adding
-+ * new API, and we'd need a fallback anyway.
-+ */
-+ {
-+ Bool (* fp_glXQueryExtension) (Display *dpy, int *err_base, int *ev_base);
-+ GModule *module = g_module_open ("libGL.so.1", 0);
-+
-+ if (module == NULL)
-+ {
-+ GDK_NOTE (OPENGL, g_message ("No libGL.so found"));
-+ return FALSE;
-+ }
-+
-+ if (!g_module_symbol (module, "glXQueryExtension", (gpointer *) &fp_glXQueryExtension))
-+ {
-+ GDK_NOTE (OPENGL, g_message ("No glXQueryExtension symbol found"));
-+ g_module_close (module);
-+ return FALSE;
-+ }
-+
-+ g_module_close (module);
-+ }
-+
- dpy = gdk_x11_display_get_xdisplay (display);
-
- if (!glXQueryExtension (dpy, &error_base, &event_base))
+++ /dev/null
-From: Emmanuele Bassi <ebassi@gnome.org>
-Date: Tue, 24 Oct 2017 16:58:06 +0100
-Subject: Add a return value
-
-When building with G_DISABLE_ASSERT, the g_assert_not_reached()
-statement won't do anything, and we're going to fall through, and the
-compiler will emit a warning that we're not returning anything from a
-function with a return value.
----
- gdk/wayland/gdkwindow-wayland.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/gdk/wayland/gdkwindow-wayland.c b/gdk/wayland/gdkwindow-wayland.c
-index cbc7bfb..61e1dcd 100644
---- a/gdk/wayland/gdkwindow-wayland.c
-+++ b/gdk/wayland/gdkwindow-wayland.c
-@@ -1617,6 +1617,9 @@ rect_anchor_to_anchor (GdkGravity rect_anchor)
- default:
- g_assert_not_reached ();
- }
-+
-+ return (ZXDG_POSITIONER_V6_ANCHOR_TOP |
-+ ZXDG_POSITIONER_V6_ANCHOR_LEFT);
- }
-
- static enum zxdg_positioner_v6_gravity
-@@ -1650,6 +1653,9 @@ window_anchor_to_gravity (GdkGravity rect_anchor)
- default:
- g_assert_not_reached ();
- }
-+
-+ return (ZXDG_POSITIONER_V6_GRAVITY_BOTTOM |
-+ ZXDG_POSITIONER_V6_GRAVITY_RIGHT);
- }
-
- static GdkWindow *
+++ /dev/null
-From: Benjamin Otte <otte@redhat.com>
-Date: Tue, 24 Oct 2017 18:13:45 +0200
-Subject: Add default return values to switch statements
-
-We are using g_assert_not_reached() without doing anything, assuming it
-aborts the program. In release builds however, it is ignored.
----
- gdk/x11/gdkdevicemanager-core-x11.c | 2 ++
- gdk/x11/gdkdevicemanager-xi2.c | 2 ++
- gtk/gtkcssselector.c | 1 +
- gtk/inspector/general.c | 2 +-
- 4 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/gdk/x11/gdkdevicemanager-core-x11.c b/gdk/x11/gdkdevicemanager-core-x11.c
-index 350a79b..dd8613e 100644
---- a/gdk/x11/gdkdevicemanager-core-x11.c
-+++ b/gdk/x11/gdkdevicemanager-core-x11.c
-@@ -265,6 +265,7 @@ translate_crossing_mode (int mode)
- return GDK_CROSSING_UNGRAB;
- default:
- g_assert_not_reached ();
-+ return GDK_CROSSING_NORMAL;
- }
- }
-
-@@ -285,6 +286,7 @@ translate_notify_type (int detail)
- return GDK_NOTIFY_NONLINEAR_VIRTUAL;
- default:
- g_assert_not_reached ();
-+ return GDK_NOTIFY_UNKONWN;
- }
- }
-
-diff --git a/gdk/x11/gdkdevicemanager-xi2.c b/gdk/x11/gdkdevicemanager-xi2.c
-index 8779c65..758513e 100644
---- a/gdk/x11/gdkdevicemanager-xi2.c
-+++ b/gdk/x11/gdkdevicemanager-xi2.c
-@@ -1068,6 +1068,7 @@ translate_crossing_mode (gint mode)
- /* Fall through, unexpected in pointer crossing events */
- default:
- g_assert_not_reached ();
-+ return GDK_CROSSING_NORMAL;
- }
- }
-
-@@ -1088,6 +1089,7 @@ translate_notify_type (gint detail)
- return GDK_NOTIFY_NONLINEAR_VIRTUAL;
- default:
- g_assert_not_reached ();
-+ return GDK_NOTIFY_UNKONWN;
- }
- }
-
-diff --git a/gtk/gtkcssselector.c b/gtk/gtkcssselector.c
-index 241a690..961e78e 100644
---- a/gtk/gtkcssselector.c
-+++ b/gtk/gtkcssselector.c
-@@ -876,6 +876,7 @@ change_pseudoclass_position (const GtkCssSelector *selector)
- return GTK_CSS_CHANGE_FIRST_CHILD | GTK_CSS_CHANGE_LAST_CHILD;
- default:
- g_assert_not_reached ();
-+ return 0;
- }
- }
-
-diff --git a/gtk/inspector/general.c b/gtk/inspector/general.c
-index 2e7e212..62404a0 100644
---- a/gtk/inspector/general.c
-+++ b/gtk/inspector/general.c
-@@ -501,7 +501,7 @@ translate_subpixel_layout (GdkSubpixelLayout subpixel)
- case GDK_SUBPIXEL_LAYOUT_HORIZONTAL_BGR: return "horizontal bgr";
- case GDK_SUBPIXEL_LAYOUT_VERTICAL_RGB: return "vertical rgb";
- case GDK_SUBPIXEL_LAYOUT_VERTICAL_BGR: return "vertical bgr";
-- default: g_assert_not_reached ();
-+ default: g_assert_not_reached (); return "none;
- }
- }
-
+++ /dev/null
-From: Benjamin Otte <otte@redhat.com>
-Date: Tue, 24 Oct 2017 18:26:08 +0200
-Subject: Fix build
-
-Don't do two things at once and forget to run ninja before pushing.
----
- gdk/x11/gdkdevicemanager-core-x11.c | 2 +-
- gdk/x11/gdkdevicemanager-xi2.c | 2 +-
- gtk/inspector/general.c | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/gdk/x11/gdkdevicemanager-core-x11.c b/gdk/x11/gdkdevicemanager-core-x11.c
-index dd8613e..c662d21 100644
---- a/gdk/x11/gdkdevicemanager-core-x11.c
-+++ b/gdk/x11/gdkdevicemanager-core-x11.c
-@@ -286,7 +286,7 @@ translate_notify_type (int detail)
- return GDK_NOTIFY_NONLINEAR_VIRTUAL;
- default:
- g_assert_not_reached ();
-- return GDK_NOTIFY_UNKONWN;
-+ return GDK_NOTIFY_UNKNOWN;
- }
- }
-
-diff --git a/gdk/x11/gdkdevicemanager-xi2.c b/gdk/x11/gdkdevicemanager-xi2.c
-index 758513e..56fb2c8 100644
---- a/gdk/x11/gdkdevicemanager-xi2.c
-+++ b/gdk/x11/gdkdevicemanager-xi2.c
-@@ -1089,7 +1089,7 @@ translate_notify_type (gint detail)
- return GDK_NOTIFY_NONLINEAR_VIRTUAL;
- default:
- g_assert_not_reached ();
-- return GDK_NOTIFY_UNKONWN;
-+ return GDK_NOTIFY_UNKNOWN;
- }
- }
-
-diff --git a/gtk/inspector/general.c b/gtk/inspector/general.c
-index 62404a0..45a386e 100644
---- a/gtk/inspector/general.c
-+++ b/gtk/inspector/general.c
-@@ -501,7 +501,7 @@ translate_subpixel_layout (GdkSubpixelLayout subpixel)
- case GDK_SUBPIXEL_LAYOUT_HORIZONTAL_BGR: return "horizontal bgr";
- case GDK_SUBPIXEL_LAYOUT_VERTICAL_RGB: return "vertical rgb";
- case GDK_SUBPIXEL_LAYOUT_VERTICAL_BGR: return "vertical bgr";
-- default: g_assert_not_reached (); return "none;
-+ default: g_assert_not_reached (); return "none";
- }
- }
-
+++ /dev/null
-From: Marek Kasik <mkasik@redhat.com>
-Date: Thu, 19 Oct 2017 13:59:58 +0200
-Subject: printing: Install printbackends
-
-Add "install : true" for each printbackend so that they are installed.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=789185
----
- modules/printbackends/cloudprint/meson.build | 3 ++-
- modules/printbackends/cups/meson.build | 3 ++-
- modules/printbackends/file/meson.build | 3 ++-
- modules/printbackends/lpr/meson.build | 3 ++-
- modules/printbackends/papi/meson.build | 3 ++-
- modules/printbackends/test/meson.build | 3 ++-
- 6 files changed, 12 insertions(+), 6 deletions(-)
-
-diff --git a/modules/printbackends/cloudprint/meson.build b/modules/printbackends/cloudprint/meson.build
-index c6193f4..f5217cb 100644
---- a/modules/printbackends/cloudprint/meson.build
-+++ b/modules/printbackends/cloudprint/meson.build
-@@ -7,4 +7,5 @@ shared_module('printbackend-cloudprint',
- '-DGTK_DISABLE_DEPRECATION_WARNINGS',
- ],
- dependencies: [ libgtk_dep, rest_dep, json_glib_dep ],
-- install_dir: printbackends_install_dir)
-+ install_dir: printbackends_install_dir,
-+ install : true)
-diff --git a/modules/printbackends/cups/meson.build b/modules/printbackends/cups/meson.build
-index e69788d..a6f83d5 100644
---- a/modules/printbackends/cups/meson.build
-+++ b/modules/printbackends/cups/meson.build
-@@ -18,4 +18,5 @@ shared_module('printbackend-cups',
- '-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED',
- ],
- dependencies: [libgtk_dep, libcups, colord_dep],
-- install_dir: printbackends_install_dir)
-+ install_dir: printbackends_install_dir,
-+ install : true)
-diff --git a/modules/printbackends/file/meson.build b/modules/printbackends/file/meson.build
-index 52ab3a3..b1604be 100644
---- a/modules/printbackends/file/meson.build
-+++ b/modules/printbackends/file/meson.build
-@@ -6,4 +6,5 @@ shared_module('printbackend-file',
- '-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED',
- ],
- dependencies: libgtk_dep,
-- install_dir: printbackends_install_dir)
-+ install_dir: printbackends_install_dir,
-+ install : true)
-diff --git a/modules/printbackends/lpr/meson.build b/modules/printbackends/lpr/meson.build
-index 95a982d..581ca77 100644
---- a/modules/printbackends/lpr/meson.build
-+++ b/modules/printbackends/lpr/meson.build
-@@ -6,4 +6,5 @@ shared_module('printbackend-lpr',
- '-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED',
- ],
- dependencies: libgtk_dep,
-- install_dir: printbackends_install_dir)
-+ install_dir: printbackends_install_dir,
-+ install : true)
-diff --git a/modules/printbackends/papi/meson.build b/modules/printbackends/papi/meson.build
-index feef640..647234e 100644
---- a/modules/printbackends/papi/meson.build
-+++ b/modules/printbackends/papi/meson.build
-@@ -6,4 +6,5 @@ shared_module('printbackend-papi',
- '-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED',
- ],
- dependencies: [libgtk_dep, libpapi],
-- install_dir: printbackends_install_dir)
-+ install_dir: printbackends_install_dir,
-+ install : true)
-diff --git a/modules/printbackends/test/meson.build b/modules/printbackends/test/meson.build
-index a8df4fe..29cf00b 100644
---- a/modules/printbackends/test/meson.build
-+++ b/modules/printbackends/test/meson.build
-@@ -6,4 +6,5 @@ shared_module('printbackend-test',
- '-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED',
- ],
- dependencies: libgtk_dep,
-- install_dir: printbackends_install_dir)
-+ install_dir: printbackends_install_dir,
-+ install : true)
+++ /dev/null
-From: Andreas Henriksson <andreas@fatal.se>
-Date: Wed, 23 Mar 2016 14:10:27 +0100
-Subject: disable a11y test accessibility-dump
-
-Temporarily disable this test until someone figures out how
-to make it run with GTK_CSD=1 properly so it gives output
-matching the expected test data in all cases, not just
-for installed-tests.
-
-Forwarded: no
----
- testsuite/a11y/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/testsuite/a11y/meson.build b/testsuite/a11y/meson.build
-index 164eda4..5db57c5 100644
---- a/testsuite/a11y/meson.build
-+++ b/testsuite/a11y/meson.build
-@@ -2,7 +2,7 @@ testexecdir = join_paths(installed_test_bindir, 'a11y')
- testdatadir = join_paths(installed_test_datadir, 'a11y')
-
- a11y_tests = [
-- 'accessibility-dump',
-+# 'accessibility-dump',
- 'tree-performance',
- 'text',
- 'children',
1 file changed, 21 insertions(+), 1 deletion(-)
diff --git a/testsuite/reftests/gtk-reftest.c b/testsuite/reftests/gtk-reftest.c
-index 758007a..37d1bfc 100644
+index 3a4792e..b6f3738 100644
--- a/testsuite/reftests/gtk-reftest.c
+++ b/testsuite/reftests/gtk-reftest.c
-@@ -256,6 +256,20 @@ save_image (cairo_surface_t *surface,
+@@ -250,6 +250,20 @@ save_image (cairo_surface_t *surface,
g_free (filename);
}
static void
test_ui_file (GFile *file)
{
-@@ -288,7 +302,13 @@ test_ui_file (GFile *file)
+@@ -282,7 +296,13 @@ test_ui_file (GFile *file)
if (diff_image)
{
save_image (diff_image, ui_file, ".diff.png");
-no-accessibility-dump.patch
reftest-known-fail.patch
-gdk-x11-Check-if-we-have-access-to-GL-before-using-G.patch
-git_add-a-return-value.patch
-git_add-default-return-values.patch
-git_fix-build.patch
-git_install-printbackends.patch
projects / gtk4.git / commitdiff